Merge fb721297e1037ccf1171c35025e3325a1f944f61 on remote branch

Change-Id: Id010dd76481ed62e506b0a5118b3d86a70d059aa