Fix the build warnings. Fix: 304200229 Test: Visual Test Change-Id: Ib2a3a13ad2b5f845fa257d6ea08f02be790d0b91