Merge commit 'd46754fc2dbd5a16a6f555163f3d65bca7ee39ac' into HEAD
Change-Id: I4197d1ae62290d51a9914fe150ceac3f675f801b