Merge branch 'stable/juno' into stable/junoplus

Change-Id: I5145251b18bf436b3a2d5ac43da1ca62b24b7d5a