Merge a863af38183bfdf4b11d2469b99efd44e7d1015a on remote branch

Change-Id: I6c268adaa34afc75f9b27ad1116ec71500608576