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

Change-Id: I9601fda00ccff581fcf0eb9dfe47c1bf87e5bda0