Reconcile with mr1.1-release

Change-Id: I61e5c59ba2ba1e1072440cc46202a88d3f89c1f7