Merge "Prevent callbacks being called before the constructor" into rvc-dev am: 8c6907d56f

Change-Id: Id3d1181662a340f15e2372d05a8cb0a9f426ab56