Casimir: sync with internal

Test: m Casimir
Merged-In: I49052db3ecc4c98c26bec13da94b2478fb314e20
Change-Id: I08b2d49a08bda083579d5a2f4cf28c956e393648
2 files changed