q_api_data is not used in 1.1

Change-Id: I4b4257c9148c12a6c71b0aed3476bfe0e59b2f76
Merge "q_api_data is not used in 1.1"