Merge c473382766c77e510b9f68e089f7398eba4c367d on remote branch

Change-Id: I9607b5313bd8e9af1bd39b71e02bc79f17c8354f