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

Change-Id: I4ee4bffe9c7edb999646ecfd1eda7f693566943f