Bug: 4517456 Original CL: Icec380f3ca05cf798cc4b82155d0cecf178633a5 Change-Id: I579fb1ee1b53d312f7cfc5c689d4500cb875352e