Merge "Scan system_ext while bootstrapping" am: fcb7b901e7
am: 7f611d6a8b

Change-Id: I4662fe31054e07036a186b7dcc3eeb4374659d6c