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