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

Change-Id: Iaa4e6374ff4c693fbcacf52dfa2053246f514ff5