BUG: 129003204 Test: Ran rebuild script Change-Id: Iac8557ed3b6ab95cd8b8132cbf32936141ebda14
mentioned in commit 20e1214f