Merge "Stack: Add symbol caching" am: b60fce019d
am: 698998afca

Change-Id: Iec5b3180e0872046ee9c6b59cb9dfe67bae35069