Fixing Compilation issues.

Change-Id: I3934dc861454f245a61c34a2cbd8dbd31147dfb2
(cherry picked from commit bb239ed63fe95c799c634109614c27c71ccfa544)
(cherry picked from commit 4143b7c7a3beb6835f673404bc13cddd22e1c298)