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

Change-Id: If4395b36bcd7a476a0d4ce4594929db2d8c80b74