Reconcile with jb-mr1-release - do not merge

Change-Id: Iaa26de823282e7aba1ec495c04de885dd5267982