Merge commit '86ff4a1905474bbcbef9b174013fe02740f78a0d' * commit '86ff4a1905474bbcbef9b174013fe02740f78a0d': SDK: remove default.properties from ApiDemos
Merge commit '86ff4a1905474bbcbef9b174013fe02740f78a0d' * commit '86ff4a1905474bbcbef9b174013fe02740f78a0d': SDK: remove default.properties from ApiDemos