Merge commit 'f3df716ee2164500d7feafc09c8f1e40ec007c2e' into HEAD
Change-Id: Iabc1229142bd38c214b6752b1a967cdb04a95285