Bug: 124234733 Change-Id: I5d62785cc209b72b920c19f761a9e6de9cd568e8
mentioned in commit ab5d58c8
mentioned in commit daffd80e