Merge "Fix measurement of list with single item" into pi-dev
am: beefded4c7

Change-Id: Ie8f03831bb249591ef4308abade4ba7162b53aa4