Reconcile with jb-mr1.1-release - do not merge

Change-Id: I8c005f84138fa3c89e006790fcf107e521dfa20e