Bug: 153443049 Change-Id: Ieaa4b8144eba11c5d3025a1bcca42a8552d1c702 (cherry picked from commit 1a09958626)
1a09958626