Reconcile with jb-mr1-release - do not merge

Change-Id: I4699c3ff7316df6659977ec08e7f386f98202c43