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

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