Merge 5ed491fe31aac8da6776835b7ee4f4fa42ddcb68 on remote branch

Change-Id: I0069f7b9bcab93144543db1a791370a4fcd1869d