Merge commit '6f260b7f3483e0ce1fd80f6ee45c4df4211aff74' into HEAD
Change-Id: I9e2fc3d6b7979b3fd8310577c64bf2487c524474