Merge commit '3354ec9390f7339e6b87d011e27de74ec55468a6' into HEAD

Change-Id: I7ca3b35a1c66cbcbd1456cbd23af959ec4bde70c