Merge ed383ff8fbcda551a55ff823db935f7e0b374795 on remote branch

Change-Id: I42c0de30fb1921bef9fe720dccdccfb9c165de53