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

Change-Id: I0abb01fbef13917a9bcb494f72afa4879e46e1c8