Reconcile with jb-mr1-release - do not merge

Change-Id: Ie8d4bb5b8a60d1c3624fb7f7ded0d750ce9deb7e