am 88bc9753: Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev

* commit '88bc9753c30c9ab3c92d074ae49520cfa2258b16':
  DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes