Merge branch 'master' into master-juno

Change-Id: Ie2ce2c884761552b4c23dccb9c5755a39368fc11