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

Change-Id: Ibf9855760f7d02ec5be5e3b1799f04b14c40c39e