am 7e4712c9: Reconcile with jb-release

* commit '7e4712c96ff60391892425ee50b02170aac3c3d0':