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

Change-Id: If899d486356937f740a959f1ca6d94b8675d857a