am a69334b1: Reconcile with jb-release

* commit 'a69334b11819054948d1c05fc4ffc0c3a8565091':