Merge "Remove deprecation suppression"
authorMoiz Raja <[email protected]>
Fri, 10 Apr 2015 16:12:02 +0000 (16:12 +0000)
committerGerrit Code Review <[email protected]>
Fri, 10 Apr 2015 16:12:02 +0000 (16:12 +0000)

Trivial merge