Merge cherrypicks of [13636770, 13638692, 13636771, 13637567] into rvc-qpr2-release

Change-Id: Ic675f13f12fa3208ecdbb648dd33a2a7d3b06436

1 files changed, 5 insertions, 1 deletions

diff --git a/init/mount_handler.cpp b/init/mount_handler.cpp
index 01abba8d1..46f833104 100644
--- a/init/mount_handler.cpp
+++ b/init/mount_handler.cpp
@@ -130,7 +130,11 @@ void MountHandler::MountHandlerFunction() {
     char* buf = nullptr;
     size_t len = 0;
     while (getline(&buf, &len, fp_.get()) != -1) {
-        auto entry = ParseMount(std::string(buf));
+        auto buf_string = std::string(buf);
+        if (buf_string.find("/emulated") != std::string::npos) {
+            continue;
+        }
+        auto entry = ParseMount(buf_string);
         auto match = untouched.find(entry);
         if (match == untouched.end()) {
             touched.emplace_back(std::move(entry));