[PATCH 1/6] Make sure container changes worked before applying device changes. (#965805)