2a2cb92b5a
Adapt files to match new requirements, add assertIn to whitelist Change-Id: I516bbbb3a0f194e8fa08d04c0290b586963b8b55