am 3902e196: am f2701a8a: Reconcile with jb-mr1-release - do not merge

* commit '3902e1967eacb8211c2805eb4281c555bb0df8d8':