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

Change-Id: I5bc188cec8da267e046aa1d9bb5aaa2338a0ecd7