Merge fe9d2bb0242f01cdd75d38422a8b6126bb6e2095 on remote branch

Change-Id: Iba30f616e5bf41b3eff6ea86fa3e4ce618db94c2