Bug: 27692239 Change-Id: I50e671222efc415fb930e5493f1943c5b8f6a71c (cherry picked from commit fe606f0939)
fe606f0939