Merge ab/5111269 into master

Test: TH
Bug: 119522286
Change-Id: I0481b3f41b2c4895b88bdd8a58d32ae02769bca7