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

Change-Id: Ic2017881546bd6488432b9a87196f1c8eb6e5819