Reconcile with jb-mr1-release - do not merge

Change-Id: I92e095e0ea2a4ce39286a4b132d2ae0c68eb5e7a