Merge 134fb15d94cc3b83af9d3b779c5cebb1e96431f2 on remote branch

Change-Id: Ia0274096a23e06848cc16ea6049f78d15b730585