Reconcile with jb-mr1-release - do not merge

Change-Id: I0f7fd29de4c05e6b8298814e03ea681699117fae