resolve conflicts
Merge branch 'master' of https://github.com/kolesnikovkhv/basefm.git

Change-Id: I8a2d6f58dca66d6143af3ccce26fe75a1dff3ded


Change-Id: I7f8274a10eb8c377fccfd04ae612748fe782b312
Change-Id: I238140e18wwf42bc9b3bd16dc1251d6b1e051c272c