(cherry picked from commit 5783a741) Bug: 21572270 Change-Id: I711a9ee2d9688a8e4b59380c401f10f42c6c068e