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

Change-Id: I5d80d2ac9b2576dbea8edce42c9b4a26e676a9f7