Merge "Removes unused classes in Application side of watch face sample" into oc-dev