am 09f9ca2a: am d568fa2b: am cb4dd61d: Merge "Remove tests that no longer make sense" into klp-modular-dev * commit '09f9ca2a': Remove tests that no longer make sense