Reconcile with jb-mr1-release - do not merge

Change-Id: Idf9e1ad5fe56ee4d56e5266630b6f971ecba10c7