Merge remote-tracking branch 'origin/master' into myoga

Change-Id: Ic2337bdac4086d39ca5d1725d8e8b70cd9ac0e1f