Reconcile with jb-release

Change-Id: I7aaa394cda0be63324f5cba09f93e444fd1763fc