Merge 492ebbf0d5de5791c925de1fedd36df592629f9b on remote branch

Change-Id: I88cf00467d516577617b3ab7c476d0a7a5f678e5