Reconcile with jb-mr1-release - do not merge

Change-Id: I652e19ace85b7b2be9c723b5ce1e7f36f7ae963f