Merge 863d39fd5e12ff1d603e2edb02eeda944d65366d on remote branch

Change-Id: I078e2caecf361777ace1c125f9e6ed779b287d7e