Merge "Fix warning" am: 8960ba44ce am: 0be4f661fb
am: 1b459d203f

Change-Id: Ic2a864f9089227cdcca14f8283432b4d00abc3c8