Merge 10f7eda34d4de1a238d272712f5d622f9cd549db on remote branch

Change-Id: Ifcb2349ec3c6fe94a9ab072f13a5cedcf0a5066a