Import Cobalt 16.136005

Change-Id: I2b9198982828ad841d50902b145910c0aeb689d3