Merge changes If5b85fd1,I1dfde979 am: 11e9e2ecad am: 0b0c1b6239

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

Change-Id: I7b5c91413f8e1e71af950f7fa40c9d7ac4aaa89c