Merge d817f0e259a91acd5da25ab9dbed6fc933b3ecb2 on remote branch

Change-Id: I22a71cc296eb00e74f64f13ecae8d5de8234a47f