Bug: 30963384 (cherry picked from commit df7a4c6bae) (cherry picked from commit c12d3d250ceb6a4380d2fcaf7f6d30bdea200dad) Change-Id: Id4313e99bf86b41c3713e1c2db0242d12aeb8bb7
df7a4c6bae