Merge "Add Features expected in Lolliop and Kitkat Watch platform versions" into lmp-dev