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

Change-Id: Ic782b2031329ef8560e1c2838b9d85cec20285ed