Fix strict warning

Change-Id: Iba40af31369bf40efd39d5450ad8526f91588a70
Merge "Fix strict warning"