Merge cherrypicks of [4635676, 4637271, 4637113, 4637272, 4637273, 4637274, 4637275, 4636155, 4636156, 4636157, 4636158, 4636159, 4636160, 4637293, 4637114] into oc-mr1-iot-release

Change-Id: I75d325801dd311ac4787cfcd89b0ba5c037ae183
diff --git a/misc/blkid.c b/misc/blkid.c
index 96fffae..472f017 100644
--- a/misc/blkid.c
+++ b/misc/blkid.c
@@ -87,7 +87,9 @@
 			fputc('^', stdout);
 			ch ^= 0x40; /* ^@, ^A, ^B; ^? for DEL */
 		}
-		fputc(ch, stdout);
+		if (ch != '"') {
+			fputc(ch, stdout);
+		}
 	}
 }