Merge "Delete old and unused framework test in contrib" am: 6ea945cd1f

Change-Id: I6fec43facece721d55d4458bd419b6941c774319