Merge commit '0a642f6a2f2fec2ff90d3b4f59bf1bdeca81704e' into HEAD

Change-Id: I501d44fe1a6a9771ad9958b1f38940bf3e5397bc