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

Change-Id: Ia171a9e7d55d2e408789b1048b56ce2c7905e870