Merge 7e7190a8389a70d41ebd2174ee8693cc10d38c56 on remote branch

Change-Id: I4ab803b9ea93cac5772dcd3da2b4e7a71a00d12c