Reconcile with jb-mr1-release - do not merge

Change-Id: I429530967fde6d616b3cfefa9b68f8f32cf61697