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

Change-Id: I40e21d1cdb873a8ef0701dccfba9555154d2e901