am 95dca885: Reconcile with jb-release

* commit '95dca885cf5a88a4ee34a21e3bca4e152fff7f6c':