Merge "Metrics for content capture." into qt-dev
am: 815979d5df

Change-Id: I36c2b7f59868a9c0cf05d46073838bf16e4a194e