Merge "build warnings"
am: 90f3dcf315

Change-Id: I7cfcdeacccb98968321eb0f8e805eae00b66d6c8