Merge "Store hard refences in a static context and pass through only weak am:...

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

Change-Id: Ie2151b0ee4e25850b68ecaf349e85ec2fcc65565