Merge "Remove incorrect checks for ShadowFrame in GetLocalInstance"
am: ae9f3e42a7

Change-Id: I289e4c0f7676db7b425d2d5dd9ba7585d25df937