Reconcile with jb-mr1-release - do not merge

Change-Id: I420335816924d2937f0cae7205886f8354533493