Reconcile with jb-release

Change-Id: Icc86c6dba50bad25e4031c47a2580a1af4eeeb1e