Reconcile with jb-mr1-release - do not merge

Change-Id: I33319cd5922c68dc837e732a183041520a4ea634