am f8da4ca6: am 5e7165c0: am a39fb369: 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 'f8da4ca6dcb23273847b81ba332d5aafdf1b5540':