am a1c8d491: Reconcile with jb-release

* commit 'a1c8d491e40f972967b4ab89f63625a570fbf8fb':