Reconcile with jb-mr1-release

Change-Id: I24d0e6053d88454b69e55224a4e78f85ed0893db