Merge e4981672c31aacfc7bd0160edc0d513dd9918d0e on remote branch

Change-Id: I435a56f74fa9d35809fb107462c35d1e5fdcd13b