Updating main branch

Creating a pull request for commenting ability
Related: Android Code Styles - Field Naming Conventions https://source.android.com/source/code-style.html#follow-field-naming-conventions