Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Icc3befe821116c1f41148e0667ba0d8864788182