resolve merge conflicts of d58878b7fa0ff451793bca77dca2b61fce95bd28 to rvc-d1-dev

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I2e774d7c8e5f8da6940854cbf1561d7bd698ee3c
988 files changed