am 09d44e75: Merge "Add Features expected in Lolliop and Kitkat Watch platform...
am 09d44e75: Merge "Add Features expected in Lolliop and Kitkat Watch platform versions" into lmp-dev
* commit '09d44e75':
Add Features expected in Lolliop and Kitkat Watch platform versions