Reconcile with jb-release - do not merge

Change-Id: Ia3f31a8ec0a6ca08ee8555124019a0f89e57d671