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

Change-Id: I833db3c1458b360d17442413b86b546dc650bc0c