Merge "init: move empty string check to InitTriggers" am: 9bf10ff61e am: 5514c50292
am: 934f465edb

Change-Id: Ie1af20f712ee546b2770907c478aa88e247f57ac