Reconcile with jb-release

Change-Id: I498fdba3aa0836ff4f4f42e43e0e7a5d94dfa25d