Merge commit '66f17e50dbb42bc529dd12b2f26729f114b1a1a9' * commit '66f17e50dbb42bc529dd12b2f26729f114b1a1a9': ApiDemos Clean up
Merge commit '66f17e50dbb42bc529dd12b2f26729f114b1a1a9' * commit '66f17e50dbb42bc529dd12b2f26729f114b1a1a9': ApiDemos Clean up