Bug: 22047392 Change-Id: I736a697276020687c20dff515aabb1be1776f8c0 (cherry picked from commit ffb1a9be)