am c27ee87c: Reconcile with jb-release

* commit 'c27ee87c8da93b6d609be1be18eaa0f0c7d07e98':