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

Change-Id: Ib8cfc0531df2f008cbfec26ae0f434e41bdd4e7d