Merge "Assorted dot-wrangling." into rvc-dev am: eb7da42d am: 3c39fd60 am: 3e8ed225 am: 26eb29e5 Change-Id: I40664486c6e6d69bc97f2b7a60f8b2eee743523f