Bug: 124234733 Change-Id: Ic3452a02e917b599279ed29f56b0408117aeb02c
mentioned in commit ff6b8922
mentioned in commit 03ef73ed