(cherry picked from commit a0ce8ac4) Bug: 185153775 Test: m Merged-In: Ib5ea04b0bae0dce9783c4017f1dd0db0efd49976 Change-Id: Iaace4df9dc76b9dd099a1b4d9f4cf762edf41d29