Merge remote-tracking branch 'goog/master' into rvc-dev.

Bug: 149790059
Test: make iorapd
Change-Id: I62a37ab4c7dd0b4c5dcef51ce4a4c525f34636b5