Merge "Include 'name' in props; use post-sanitize module name." am: 7f81f5473b am: 5c54fd6dab am: 6df5847c53

Original change: https://android-review.googlesource.com/c/platform/development/+/1469871

Change-Id: I0e33d8b6ac13c479d351e73f1a5a30b102986431