Bug: 112535855 Change-Id: I8c2a5bcb7432bc81d440a621e4c565d5856e5d24
mentioned in commit c4933e42
mentioned in commit 0577b494