Change-Id: Iab3750f3a7575093a72781fed861a1f3f41f1d1f (cherry picked from commit ddc88c624b11eb0f66064a54e7c9cc50546ef6eb)