BUG: 117561734 Test: Local build gets further Change-Id: I96a0d285b98f97bed38a8f18657b9f12f21e6b47
mentioned in commit d53c9a9d
mentioned in commit 6a076d3b