Merge 6aca77656dbb544074323485b6a156fb1f5fbd55 on remote branch

Change-Id: I58ffb054ed113372520dc636e8076a361906aeac