Merge "Prevent callbacks being called before the constructor" into rvc-dev am: 8c6907d5 am: 72d06b50 Change-Id: If839f0ff4c30d9ef97138511750904ba02a2dd12