Reconcile with jb-mr1-release - do not merge

Change-Id: I4e21c53aec26d5503f1640cf06acbadcf9eedb59