Reconcile with jb-release - do not merge

Change-Id: I9328881b4ad7f1616c24abc040a9d7e702829a23