Merge 1b2fe3214c94f9bfbb430617c598148bb5118a43 on remote branch

Change-Id: I555ab1c714183f8ba5e001094d03a285481c9aaa