Merge "Handle IllegalArgumentException while doing addInterface." into rvc-qpr-dev