Merge "Use ArrayMap instead of HashMap for storing relavant nodes" into mnc-dev