Merge f61c6149d2bada4ff0873650b0c9e6775e3dc2c2 on remote branch

Change-Id: Id6fcea037e9e4077912d165298b8a7e3842c3749