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

Change-Id: Iddfb8f231599cb4d38212670febe9048cc97b572