Merge bd2e1fd0043920a345cf30f2b1e4afff53acf573 on remote branch

Change-Id: Iba4e150a62941c17bf039fca9deceae8da205a6c