Merge "Prevent callbacks being called before the constructor" into rvc-dev am:...
Merge "Prevent callbacks being called before the constructor" into rvc-dev am: 8c6907d5 am: 72d06b50 am: 37fd7dd3 am: 0ea171df
Change-Id: I7e018de139930101769cbd9621ded96eb5dcc28c