another huge cleaning up/silencing of warnings

Change-Id: Id478899cb26cbead0a6c5d6dd1bf530ecb873672
Signed-off-by: zwliew <zhaoweiliew@gmail.com>