Merge "Only update reported configuration when triggered from AM side." into oc-mr1-dev