Reconcile with jb-mr1.1-release - do not merge

Change-Id: I02c7dfdcf1793b4c78a14b82e750962b95a23359