am fb8b02eb: am 073d6225: Reconcile with jb-mr1-factory-release - do not merge

* commit 'fb8b02ebb853aefb911690d6dd5e89ad68fa905d':