Reconcile with jb-mr1-release - do not merge

Change-Id: Iafd9f6d0820b8c670ca1d7763972e14cb42e98a4