Bug: 123595428 Bug: 72170747 Test: TH Change-Id: I752e81732a516e56fca6f0df2c5b7cbb1d3214e5
ff1aa4e49a