Performed a clean and added required "NewApi" Lint suppression
annotations.