Add return true to only hook without it

Change-Id: Ie04c37dbcc3f54897b8a97e8a048516bd1415129