Merge commit 'ae44c7d1307b99193d8a2ea091b7e781adadd019' into HEAD

Change-Id: I67551c8d1e004065c40c5d8eb958cb88eeb2fd03