Reconcile with jb-mr1-release - do not merge

Change-Id: I6a8c7ff2e99eba7f6efbd129e274ca8c95ab9314