Add list extensions agent am: 9527e3de28 am: 9fb5bc83f1
am: 6b8e664d32

Change-Id: I05040a1d14d33f9e914618879a5a9799b8e49964