Bug: 21991156 (cherry-picked from commit e7c7d8ed) Change-Id: I282edaaa422f393629a09cb807da889422e33fb2