Merge "Add test for ambient caps"
am: 51366e9b16

Change-Id: I268cc82e531eeb6f2df9514add9fff9aeefc2e01