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

Change-Id: I4ef3ebe3fad3c9ef87c0f7e21955867d256b5816