Merge 025130dc6e1938d95750ca36eabe0b511750e364 on remote branch

Change-Id: I12e7241ef6d8ba7dff694a4bb6ba020ccdcc7aa4