Problems identified by enabling N306 in run_tests.sh Change-Id: Ifddfe58da020dd041bcbbf5f14941514a09f61c1