Reconcile with jb-mr1-release

Change-Id: Ifb988670bdffb49f34ecbd43b13d40bae432a1a5