Merge changes from topic "bt-metadata-api-v2-qt-dev" into qt-dev
am: 10093916cc

Change-Id: Ie27219720531d7c60afbfb3b726f6ab6c2052de0