Merge changes from topics "remove_oem_configstore", "rename_oem_migration" into rvc-dev am: 256b44d61d am: 296c23fa47 am: 7287a09dfb am: 719a6bd03d

Change-Id: Ia3bf44f099b7c9b68b4aea5b7b364a9f94805be7