Merge commit '8fd9d692aabab8f55f90ab1aa2885c8502534275' into HEAD

Change-Id: I192640a4782329de7ba17082a93ce75aef56a8c4