Merge "Frameworks: Remove bogus test method" am: c65d52ff78 am: 8120e8616b
am: dd531adbd2

Change-Id: I0317dedfe5c20c54551f72e6c691dea67dde83ca