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

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