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