Merge "Merge "Assorted dot-wrangling." into rvc-dev am: eb7da42d am: 44a935af" into rvc-d1-dev-plus-aosp