Don't try to extend list with None leading to bug 1360074.

Change-Id: I08a2614efff8c50b7fc4ea3445b1e8c1c64aff08
Fixes-bug: 1360074
Merge "Don't try to extend list with None leading to bug 1360074."