Merge "Handling NPE in case of AVC level under 2" into kitkat-cts-dev automerge: d84cacb  -s ours
automerge: d830264

* commit 'd830264802e79f6da6f74ee2378e6880fb2553df':
  Handling NPE in case of AVC level under 2