Bug: https://issuetracker.google.com/138812821 Test: builds Change-Id: I2ff7793c8b1eb56f6be63375cc7b70aa44254443