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

Change-Id: I9fba6c1b91305ac17350a4dd55569c4eb76d51f7