Merge "Suppress warnings" am: 11ddfe141b am: c0c7875ec7
am: 631469f5e2

Change-Id: I57fae6a987ed0c8fa93fd7016e94720790391f51