Reconcile with jb-mr1-release - do not merge

Change-Id: Id3d564f85a9a157a34937324d65e322c584f7cdc