Merge "Don't use initializer_list as return type" am: 9c6b9bf7c3
am: fa8dfc724e

Change-Id: If491e2bade64b6ea589ea89937050124e5c9cc17