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

Change-Id: I8a58a6aebc81829d15af6802f16d956cad2d39c8