Merge remote-tracking branch 'upstream/stable/juno' into staging/junoplus

Change-Id: I110a24d619eef17b55fee37268e439e8cc2b231d