am d1dd7fbb: am 80db4328: am ca849386: Reconcile with jb-mr1-release - do not merge

* commit 'd1dd7fbb468e76ef322bff7bf74e09fbacf8c731':