Merging from ab/5068019

BUG: 117514054
Test: TH
Change-Id: Idf25d21620ba583a0daa7c4e4c541be610dbdd34