warnings be gone (2/4)

(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)
(squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)

Change-Id: I048a2c6868515716c7cd7319a3d0abe6311dac4e
warnings be gone (3/4)

(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)
(squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)

Change-Id: I0c5a0c3ea32bb5091d90c7391c67edd02e50397f
warnings be gone (4/4)

(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)
(squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)

Change-Id: I55df09714a0e1cb98a44c8fcddac2c646ae5e139