Reconcile with jb-mr1-release - do not merge

Change-Id: I7947a0dbb7343afbb2d1d7a86ec33886d8a012b5