Bug: 27291269 Change-Id: Ia7db477a95527491245dbd774d6afe36f88c97c1 (cherry picked from commit 65eaf997)