am b0679166: Reconcile with jb-release

* commit 'b06791667c60296040734cb4ec2c01ed38edf62a':