7435831cbd
Flag: NONE
Test: NONE
Bug: 331868669
Change-Id: I350e6660ea1936bb9ee799c3d2c840c57876fef4
(cherry picked from commit c0c0bdbc38)