Merge "init: don't import rc files during mount_all after Q" am: cbe0876f8b
am: 45f1c24509

Change-Id: I8c4e65b785e25faaf8df988d708261de972d90e9