Merge 784b6b44f439660913d7e6a73566b92a7cb10144 on remote branch

Change-Id: I0a712cb3120e0254c37ee58128ed28f4d17c7699