Use std::initializer_list

Change-Id: I726fc6429a2eb7827d09d04584fd0b725e78f650