Merge "Adding system app ota tests."