Reconcile with jb-mr1-release - do not merge

Change-Id: Ie852ca3761e50d4e84e554572faa3920e1880821