Merge changes from topic "keystore-niap"
am: 91df8c0c63

Change-Id: I74e409b5da1f7ce7004a5c84ec17a1497f15c59c