[automerger skipped] Test sendCaps and sendProps am: e582c5d4be am: 9537b28136 -s ours
am skip reason: Change-Id Idefce1174b82668d23c53dd1bf95bc660cb21c28 with SHA-1 d5f249c24c is in history
Change-Id: I3d56ac1069f5903dcf87e4e398445bcae8686225
This commit is contained in: