Merge "Convert specification/Android.mk to Android.bp"
diff --git a/testcases/host/firmware_test/OWNERS b/testcases/host/firmware_test/OWNERS
index 1e9b5e7..95e2d3b 100644
--- a/testcases/host/firmware_test/OWNERS
+++ b/testcases/host/firmware_test/OWNERS
@@ -1,3 +1,4 @@
 # Bug component: 30545
 hridya@google.com
 smuckle@google.com
+yochiang@google.com
diff --git a/testcases/host/kernel_proc_file_api_test/proc_tests/ProcSimpleFileTests.py b/testcases/host/kernel_proc_file_api_test/proc_tests/ProcSimpleFileTests.py
index bb6101d..fe247d6 100644
--- a/testcases/host/kernel_proc_file_api_test/proc_tests/ProcSimpleFileTests.py
+++ b/testcases/host/kernel_proc_file_api_test/proc_tests/ProcSimpleFileTests.py
@@ -223,7 +223,7 @@
     '''/proc/sys/kernel/random/boot_id generates a random ID each boot.'''
 
     def parse_contents(self, contents):
-        return self.parse_line("{:uuid}", contents, dict(uuid=token_uuid))[0]
+        return self.parse_line("{:uuid}\n", contents, dict(uuid=token_uuid))[0]
 
     def get_path(self):
         return "/proc/sys/kernel/random/boot_id"