[automerger skipped] Fix check_initial_reg_state packaging into VTS. am: 45778d28 -s ours am: e7086823 -s ours am: 846fbac2 -s ours Change-Id: Ia59ddb44603b8b7167ba532e590676db5f362ce8