2020-09-25: merge master to rvc-dev

Bug: 156001797
Change-Id: I365cefda99b36cc28733a91bf2a38c7fb2f9f139
Merged-In: I80caa0b2f75e8bd559dac47844861bead0773c01