Merge "init: fix BuildTriggersString for empty string" am: 9b1d5e15ef
am: 4286801ccb

Change-Id: I6744e47cc9e85f86217d0c6ecc96e6011e82d99a