am e2106796: Reconcile with jb-release

* commit 'e2106796e91d618f7c77d338302ab4e87c20e132':