am dc423ca3: Merge "Fix Some Tests to Support Different Kcms" into gingerbread

* commit 'dc423ca386b442845548dbce4991c927e47d0b55':
  Fix Some Tests to Support Different Kcms