Merge 47831a62645826b430019416482dc35789e22d57 on remote branch

Change-Id: Ic81e8f6522bc68372032d06a28f10c42fc75d17a