Merge 1d22bfc5c74c76a67b1064204be1d1222312a303 on remote branch

Change-Id: I226c8b118251d4c78022429854644f43b9a6a8fd