Merge eddd4916db2b090c19d1af9f3c0fd7d4608011c1 on remote branch

Change-Id: Ic9e14a74449b5ef2278f6a1d7bb4a9b001fbce0c