Merge e4981672c31aacfc7bd0160edc0d513dd9918d0e on remote branch

Change-Id: I9eff3085bea8863bf675431adf11a3492ecba912