Merge "Make Startop Test App run on O and higher"