Merge "Store hard refences in a static context and pass through only weak am: 5532c779 am: 591bbd1b" into rvc-d1-dev-plus-aosp