[automerger skipped] MediaMetrics instrumentation am: df02382bea am: 945313dc65 am: 91c7a52328 am: 163d1fa0bf am: 647d4718f2 -s ours

am skip reason: Change-Id I7fc5413a473d9526ddffc2a6e6583d0b2a7eaa2e with SHA-1 a7ec6de671 is in history

Change-Id: Icc5e3cf82d98321c400cc813dac87835eb06baf4