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

Bug: 156001797

Change-Id: Ia338928c19e4a8fdbd7a5f6397d8ae481c71ca0f
Merged-In: Ic6720cb20f47710789e39d34018315705182a8d5