[automerger skipped] Merge "Add metrics for data switch" am: 047610af am: 07ed03d7
am: c1328255 -s ours
am skip reason: change_id I47c38e2f5be20cc7e42ca26f3e127c033a0e6a2d with SHA1 c6765315 is in history
Change-Id: I80c54746e3972f32468dba8c9eda0db2b7eea930