Merge "Fix documentation bug with METADATA_KEY_LOCATION" into qt-dev
am: 8b1f5ba17e

Change-Id: Iafbdb290293c6b2fd2b32b196b60f83f5c0f6a2b