silenced some warnings

Change-Id: I2fd224c1b419d7e627fc20402d377a0e74d1755b
Signed-off-by: zwliew <zhaoweiliew@gmail.com>
silence/ cleanup more warnings

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