am f005cd6: AI 148161: CTS: Support from creating derived plans from pre

Merge commit 'f005cd606f3e89a455afe99e82752d33b47f20ca' into donut

* commit 'f005cd606f3e89a455afe99e82752d33b47f20ca':
  AI 148161: CTS: Support from creating derived plans from previous sessions.
tree: ecb7e4d6a653546506f6ba7d490ed1ebe3884e29
  1. tests/
  2. tools/
  3. Android.mk