BUG: 20652400 Change-Id: Iac7b06c18f0f370a8afdc4f91131ee9c59dc1c02 (cherry picked from commit c7495a949c)
c7495a949c