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

Change-Id: Ibe9266f7aa1f378a9e1868c927e3f28e2e2cb090