Reconcile with jb-mr1-release

Change-Id: I7a9dbdc939b8eb2cdae21553c4783ddafce88af6