Clean up warnings and some private API usage

Change-Id: Ic3c0b333942bc3de130e41531017e71358bd5bfb
16 files changed