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

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