Reconcile with jb-mr1.1-release - do not merge

Change-Id: I01e19e6776b36fbc73214d51bdf106e4fd84af96