Bug: 136049501
Test: Manually on IHU
Change-Id: I47b55e3032c814623aa5bf5c5c3ec1899c03e98e
Merged-in: I47b55e3032c814623aa5bf5c5c3ec1899c03e98e
(cherry picked from commit 16258e3e98)
Bug: 136049501
Test: Manually on IHU
Change-Id: I47b55e3032c814623aa5bf5c5c3ec1899c03e98e
Merged-in: I47b55e3032c814623aa5bf5c5c3ec1899c03e98e
(cherry picked from commit 16258e3e98)