Reconcile with jb-mr1-release - do not merge

Change-Id: Ie754a300e8665e6dfd25260714851d7bbe99261f