Merge "init: add unit tests for tokenizer.cpp" am: 749ee86faf
am: 588391fd69

Change-Id: I40b06af0a6da7c0599c522b49981ab1b425d8cf9