Merge changes If5b85fd1,I1dfde979 am: 11e9e2ecad

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1697658

Change-Id: I6895bf66ffec4a6ec1f51ee90701353aba5b507e