Bug: 14298175 (cherry picked from commit b9c0c40e) Change-Id: I453d5391d757dcdac1f6fa3b1fb7bc85144177e1