Merge "Merge changes from topic "LOADER_USAGE_STATS" into rvc-dev am: 50e02440 am: ef2565b3" into rvc-d1-dev-plus-aosp