Merge "Stack: Add subprocess caching" am: a1b14a7357
am: db19bc4e39

Change-Id: I6ddc07e04da988bd7571dfed0e331278089a06da