Fix warnings.

Change-Id: I4fa55ebcab1c14d21b5a1dd5f2cdfc0101fff3cf
Merge topic 'expand_fragment_integration' into next

1f917350 Fix warnings.