Merge c712292e628976f4b874d430e12f52aea8723547 on remote branch

Change-Id: If598288e3b563c33c4924d57ed58d1f658aa1f74