Reconcile with jb-mr1-release - do not merge

Change-Id: I699a2310b14b3168c32dca19e4c9055eeab79d1a