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

Change-Id: I6b03775515015f1db9536202d79aca5110fa8a45