Fix potential compile error "unused function" am: 9a81a6a8f8 am: 70fdb21785 am: 2ced3c5889

Change-Id: I5c54a583b5dc786dba82bd83cf4f4340c5e34379