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