Revert o.m and o.c 1.4.0 alpha updates

This matches I52c695086b90a94eab2ab92533665b44f00b9077, and we'll need to
remain compatible with the global-requirements repository.

This reverts commit 1254e2a30fa82381681db55e76da51ebd59e70a1.

Change-Id: I9b7f17f5f9325899a39ea6c20d994dbb547f6138
Merge "Revert o.m and o.c 1.4.0 alpha updates"