Merge "Add tests for ag/2086796" into oc-dev am: 7c31e7924c
am: 6c9c14e745  -s ours

Change-Id: Icf85cb5976c7adcb8fe6f2b84e0ab65bc1754e22