Bug: 18835626 Change-Id: I6f5d7820ca4e936989e862b6812934942937dfa0 (cherry picked from commit b27ba911)