Reconcile with jb-mr1-release - do not merge

Change-Id: Id3157ca77b5d15212de07d443e5f26a2c4db80fa