am bab46b4a: am d96f63d2: am e2bee5b1: am ede3db51: Merge "Fix a crash on a secondary user" into jb-mr2-dev
* commit 'bab46b4ae28fb9807bc2c5a656468cc4fdc08b3c':main
commit
7818c9ff2e
* commit 'bab46b4ae28fb9807bc2c5a656468cc4fdc08b3c':main