NON WORKING COPY
Merge branch 'master' of https://github.com/alongubkin/mosp.git