Reconcile with jb-mr1-release - do not merge

Change-Id: Ibb666e518d3d41ce85b3276a702a28d191cdba92