Reconcile with jb-release - do not merge

Change-Id: Iad597329ad4d43d1fcb29aaa7d5f13482f4e7c25