am 832c4d1a: am 09d44e75: Merge "Add Features expected in Lolliop and Kitkat Watch platform versions" into lmp-dev

* commit '832c4d1ac98d537e3ab4c2f715658923a90d470b':
  Add Features expected in Lolliop and Kitkat Watch platform versions