Merge "Handling NPE in case of AVC level under 2" into kitkat-cts-dev