Reconcile with jb-mr1-release

Change-Id: Ic0cdae375d796efb3dc07956e03fea062557b765