Merge "Prevent callbacks being called before the constructor" into rvc-dev am: 8c6907d5 am: 9cdec27a Change-Id: I52b8cd2de26c5916e546bd2693447572030f70f7