Bug: 27227225 (cherry picked from commit 97b6e131) Change-Id: I9462340a478d9b699240703d8da5967000a33d08