Merge branch 'jb43' of github.com:Snuzzo/platform_vendor_insomnia into jb43