Bug: 142480924 Test: N/A Change-Id: If61945ad02581bdcedb0e1f8603cf7970f79a0b6
mentioned in commit 92b9127f
mentioned in commit 628dbb36