Fix Apollo list padding

Change-Id: I0fcec936f78eaf786ff59ab000510134f993fdbd
Merge branch 'cm-11.0' into kk_mkt