Merge "Fix DynamicRefTable::load security bug" into oc-mr1-dev am: 2b6805fedc
am: 5ae85666ac

Change-Id: I64521a290482adb5ade95b641ce9c0c27031a814