Bug: 18768328 Change-Id: I438a1de4af0674e7ebe979d4ffa6381ada99ba65 (cherry picked from commit 122af17e)