Reconcile with jb-mr1-release - do not merge

Change-Id: I3935a689501afea5ad92ff559aa433b03d78bd65