Reconcile with jb-mr1-release - do not merge

Change-Id: Iad66846eee7ccffe9e2184838abcdb803cdf6a3f