Bug: 18380491 (cherry picked from commit 474123dc) Change-Id: I6637aaa562115f6b07d8637f0cc6658f1a6739bb