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

Change-Id: I0556388374a76450c0c3b8fbb78ef22a379d4034