misc: Merge hotfix v20.0.0.2 into develop
authorBobby R. Bruce <bbruce@ucdavis.edu>
Mon, 8 Jun 2020 22:27:51 +0000 (15:27 -0700)
committerBobby R. Bruce <bbruce@ucdavis.edu>
Mon, 8 Jun 2020 22:27:51 +0000 (15:27 -0700)
Change-Id: Ia0ed6bfb70e2ebcb22274569556d690e315702bd


Trivial merge