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

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

Change-Id: I7ffaf69ded860658abb9509d3c33330e515a3726