Reconcile with jb-release

Change-Id: I73f561b3fb9c76aa30ff7de8eab378a1ba5963cc