am 3a94ca56: am fc36efee: Merge "Fix comparison of String8 to char* literal"

* commit '3a94ca562e6a57cf324a8b8165b596ad61f7a20d':
  Fix comparison of String8 to char* literal