am fac16cce: Reconcile with jb-release

* commit 'fac16ccecb434f0fdd50471b19691988d191dc5f':