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

Change-Id: Iecaee1af6b787187f971e57d8ca3d4d223c79627