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

Change-Id: I70f80f849c6ef1d9aaa0d085f508b1b3f4cd29d6