Merge c1a54fcde9aafe092ae341870fb3a1779072829f on remote branch

Change-Id: Ic41d94fcbe2fb61453ab7b7b40185f7d80ec924e