Merge commit '72edabf1a4d63acc5bd304406b39998913ea2490' into HEAD

Change-Id: I31cdcf3593fb8f026cfcdf8fbe8f61203c259e27