Merge "Selectively redact XMP data" into qt-dev
am: ce8bf26baa

Change-Id: I8e321961b88b306f016ffe2e210ca514fdf59c47