2020-06-24: merge master to rvc-dev Test: tree-hugger Bug: 156001797 Merged-In: Ic58f9dfef22bb92ecb143563e90a6af430b433d0 Change-Id: Id46d89271db277b935cccce0b9541ff80b951753