Reconcile with jb-mr2-release - do not merge

Change-Id: If4df437d46af4b05beeb9fc08882d4cb8e94b198