Merge "Revert test changes for post startup methods change" am: 5fde01a13f am: 6b9317ecd3 am: 786d9bfd0d
am: 539bab7833

Change-Id: I801d918f142a5e6aa2bad5714b202a1c95b53858