Bug: 16828525 (cherry picked from commit df1532b9) Change-Id: I66756348b2aa50e41dacca59769b6810a91c73b0