Merge "Wait longer for configuration change" into rvc-dev am: 85c2ee6155 am: 1be9aae89d am: dde8929448

Change-Id: I4ad00f7bd74459a1172c12e8c6f2f9bd49bbb523