Merge commit '05fd0bbcdede0dc94c684b057944fd261473ecbd' into HEAD
Change-Id: Ic64835fa27cd7b1a56b6b8871f1877ecf04a266f