Also made the class final, since it cannot be instantiated by applications. Change-Id: I540ad56d19debd99426d37b9b63c163827b4c2fc
Change-Id: If71ce3b521fe17578feb5c2a2f7fd65696720554