Merge "Rewrite multicharacter constant using constexpr" am: 991667ba8c
am: 3f6292ea81

Change-Id: I8ccf4b34cb9dc76c91ceac5f928918fa2e0b7ec0