Merge "init: simplify keyword_map"
am: 3af3fcce45

Change-Id: I388b9417dbb6988db59d192c8071900d317c17dc