Merge commit '340f0ea55abd42eeb719a007e488b543f921061e' into HEAD
Change-Id: I94d7e9148f11bd14727b75cb49696e631d073200