Merge bc17f4a6c792c74be97bf5ffa61ca4290990f48c on remote branch

Change-Id: Ibaf447dd93154854894255d3a2f451fab645cf67