Merge "Rewrite multicharacter constant using constexpr" am: 991667ba8c am: 3f6292ea81 am: 2ef0bdafc1
am: 860f72fff5

Change-Id: I89f0b62dac94e9617214ff40709e3b6c5954eddd