am a508b3d7: Reconcile with jb-release

* commit 'a508b3d74454664e209e315ba9296b53cf50c13d':