Merge bd34eecf8ed4cef1bf5c40f4ccd26e97294fb4df on remote branch

Change-Id: I4ccd7357b65048f3110df2c4120b515c7fba874f