Merge changes from topic 'qc_api_drop'

am: 6ffa14dd6c

Change-Id: I7e238a6e7e6c53241992771be39a1be85c333730
This commit is contained in:
Etan Cohen 2017-01-05 17:55:17 +00:00 committed by android-build-merger
commit 4bcde74d50

Diff content is not available