Merge 7caf563e23298cc6c6947318f74b4b2b3fad53a3 on remote branch

Change-Id: I0d2ed520d0a310877b4b8a0f8c7d6ecacd62a85e