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

Change-Id: Ie60e91e401a97a8a124237eae06b6ccda534290f