Adding more comments and fixing some style issues. Test: Android builds Change-Id: I70f74c029cf0aed99aaf55b484729a2f3d289e94