Bug: 182164496 Test: N/A Change-Id: I96bdef1c79f8f91d33d6a6a734bc94e162a5ea33 (cherry picked from commit 2d12628e)