Bug: 153821199 Change-Id: I0caa546254bb51ca8b88cdb16d79c054560bf2be (cherry picked from commit e620872b18)
e620872b18