Merge "Remove nvram trusty implementation." into oc-mr1-dev