Reconcile with jb-mr1.1-release - do not merge

Change-Id: If99ecfdce01c838237eaa9ae3e403fcee0a5892c