Bug: 28311991 (cherry picked from commit e792305f) Change-Id: Icfb646ff62965daee51f65f46f4911cf0751bf8d