Replaced milestone-proposed branch with proposed/juno

Change-Id: I67252bd8f05e37f080cfa8a0ce8db41754245f23