Reconcile with jb-mr1-release - do not merge

Change-Id: I73718e42a2afb6ee8fec129ee89b49070af39b8d