Merge e895247d46fc9baf7af39e86a15e82788f2980a3 on remote branch

Change-Id: I109b02c01135fafe05d1a232c9cf44377b6f782b