am dc743aad: Reconcile with jb-release

* commit 'dc743aad320f443f4caffbabea8dc6d3af538766':