Bug: 16930909 (cherry picked from commit a5f90b6f) Change-Id: I3ee40ffbeeabf53c72ea5781d02cda1b92b13289