Bug: 16571371 (cherry picked from commit 76a07239) Change-Id: Ib3a7bcda8aecdf7e92ea40a76de32aed83a42ee0