Bug: 143353100 Change-Id: I52d0794aad26c1d1de8cb373f3398f626c15b4af (cherry picked from commit d1a67d0d72)
d1a67d0d72