Reconcile with jb-mr1-release - do not merge

Change-Id: I385ce51e37f3116c03d7de78036f4ed7ad883641