Reconcile with jb-mr1-release - do not merge

Change-Id: I09d9a4b9724aff88f27a7d906c37691ee30ea96e