Merge "Fix Some Tests to Support Different Kcms" into gingerbread