Merge c712292e628976f4b874d430e12f52aea8723547 on remote branch

Change-Id: Ica7f15a9d74a5c1e3fb289fe51f2d6b23ff02919