updates on basis of db split
Merge branch 'meru_deviceapp' of https://github.com/charugvvdn/Meru into meru_deviceapp