Reconcile with jb-mr1-release - do not merge

Change-Id: I7e816b8eaaa8b185cbfb29357dfdd71038f447e8