am 63e04a52: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '63e04a5266662f4fb57fceffcd7763fae3d464de':