Merge "Merge "Remove DERInteger usages" am: 1835a248 am: 07e62d76 am: 96bdc2d7 am: a96a45be" into rvc-qpr-dev-plus-aosp