Merge "Make Development test app S+ compatible."