Merge 793549eea5e6c876695638743a79b2047ac9fd6f on remote branch

Change-Id: I60c14c3afb4eaf5e344af8d42452812c9751ce60