am 899daf75: am d7e89906: Update platformDir search in tests. [DO NOT MERGE]

* commit '899daf759e02bef0de14dc1a14b96b4d71f0b9fc':
  Update platformDir search in tests. [DO NOT MERGE]