Merge dec6be012b73ae00563c1037b9d406f238b1fa9b on remote branch

Change-Id: Ibed33e0791ac60349f4768df0270d48d0f8b5c6b