Merge c60bdd41d513b84e197cd0d9bcb93a36bdcaab06 on remote branch

Change-Id: I068f26e6e9719926eb4067bd25b2c33816d4c52f