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

Change-Id: I5edb3257bf8f06c3274051af0c4da369d8643ca0