Reconcile with jb-mr2-deb-factory-release - do not merge

Change-Id: I8cef01a88b58eb33c82f6f6080d43490847fc377