Revert "Merge tag 'v0.42' into update"

This reverts commit 2b7199e5e996a3e10f35fee447c4a44e4f95680f.

Reason for revert: Discussed offline

Change-Id: Ic27149048d0629b717967f87ad5ad186bc0f9b9c
1 file changed