Merge commit '77d1d54f73e3fd31be64263e20f175733c1089d6' into HEAD

Change-Id: Ib9dbbcd06ea75f30a6da03bb5a2992e173c80825