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

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