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

Change-Id: I3331bb9b846bc698339f8ce6bcf33b37d92a8074