Bug: 171979838 Test: Make Change-Id: I060ebbc2ed3c13b2d56d705e5d6b9b0211f7b2af (cherry picked from commit e702bf07)