Merge fafdcd568a86688c03adfd0930f67df1c225f7e1 on remote branch

Change-Id: If20b73fe9770ad85d4b1fa54e51a46655bc53e10