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: 9cdec27a am: d908415a am: d9c1c131
Change-Id: I502f694dacedf8e5b8c4cc35d038184e965f3778