Merge "Don't send configuration that app doesn't support to it." into oc-dev
am: 22c1275c89

Change-Id: Ib7b3b945c476fae59800421c6075397d8bb6352c