Bug: 127812889 Change-Id: Ic7b241146b0e38eeacad7113b9cab7d562591cc7
mentioned in commit 1c23c72b
mentioned in commit 84f5088b