Merge commit 'a7e92c297e6380917411f7271b036d724fd00b14' into HEAD

Change-Id: I6a87aa70ccb73422ca581fe6b0a0968ff7e34989