Merge commit 'bf46871b35f3a2a807705766490e19a537d1c44e' into HEAD

Change-Id: I0efdb5a7e67d8666afd6e470b7d8285091a6ecfb