Merge 8786544c594c580a46633f19429e698ae448cee8 on remote branch

Change-Id: Iee90da171355cfb8542a9fd125d374b9b12460c5