bug:29449194 (cherry picked from commit d8aa513e) Change-Id: I58bd94a6c8cef7b6ac52dfb375a1df1937510767