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

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