Bug: 158855992 Change-Id: I2c0cb74edfea5406e79aa99d6604183e63c1f0f1 (cherry picked from commit 05179b6650)
05179b6650