am dc66c953: Reconcile with jb-release

* commit 'dc66c953c3551f6df89389cb2f47b14edfd7d5b7':