Reconcile with jb-release

Change-Id: I815e9292c3078eddde37ede41876d9219e4e2784