am 669cd99b: am 42c295fb: am d8302648: Merge "Handling NPE in case of AVC level under 2" into kitkat-cts-dev automerge: d84cacb  -s ours

* commit '669cd99b427273ce6219e606b49ed07836dca16d':