Merge "Fix construction of algorithm list" into pi-dev am: d797e2b90e
am: cf62883c8b

Change-Id: I647f331c5118a28f9a16a6748c29a1deb1fb5082