am 0eea97db: am f45516ef: Remove build warning due to test cleanup

Merge commit '0eea97db557674577a62cd56696c70ba52d56d76'

* commit '0eea97db557674577a62cd56696c70ba52d56d76':
  Remove build warning due to test cleanup