Merge changes from topic 'diskstats-mr2' into nyc-mr2-dev
am: 639f95dd13

Change-Id: I3491a1ef5303e8e991eafe3911c882d94d4d3ed5