am 76533ab5: Reconcile with jb-mr0-release

* commit '76533ab5926089ffde286cd34090eddfc5b9d947':