Bug: 118445723 Test: vendor Change-Id: I2dbdf3bf289c34409db341d7c0502cd88a20bab5
mentioned in commit 6265f54c