Reconcile with jb-mr2-release - do not merge

Change-Id: I93c0800a90b8c82a59e9f2de7d89d78bf8304733