bug:23128949 (cherry picked from commit fcdd7294) Change-Id: I7f6c428511ee7fe346c665be8f02880bcc317cae