Merge 796da61c008cd3c505f388701c77fb92da2b3b5e on remote branch

Change-Id: I3aa89567006d0cdb63bf3ea8accc09d7458e3ba0