Merge \"Remove non-CTS packets assertion code\" into marshmallow-cts-dev
am: 0ba763ab98

Change-Id: I9d9549d4388af53475a0457f7be1d55d88d5e72d