Reconcile with jb-mr1-release - do not merge

Change-Id: Ic385ef16d6d685014334b320ddb7f1929c34bfd3