Merge commit '5a35081052cdbd5229a9e01528754d64e9570f39' into HEAD

Change-Id: I3995175f17146c9b960f07a3128376b268fa0f97