Reconcile with jb-release

Change-Id: I844298c1774f33c14b2cab56fa9f8ba23485faaf