Bug: 137181479 Change-Id: I81a2938cfb39c0d5975f933244e61e6dafa1e834
mentioned in commit 3c0cc1c2
mentioned in commit 48c6e13e