am 5c0da20c: am 71a408b9: Reconcile with jb-mr1-release - do not merge

* commit '5c0da20cbe442794d68106c3c5ee8cd88fee9291':