Merge "No need for "and" - ListFormatter adds it" into pi-dev am: fa01fcb2c9
am: 60d57976bc

Change-Id: I77f7aa7076786c6f3855f9b976cfa70e23f0d8a0