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

Change-Id: Ib567614af9ddff4e358a8661b55f5aed016ea754