Fix build warnings

Change-Id: I33178dbe0bfc087d6599579ca0529ad853c669ed
11 files changed