Reconcile with jb-mr1-release - do not merge

Change-Id: I4a8eedf65186e150638048de58ef12a0ffe6fc98