Merge remote-tracking branch 'goog/master-cf-common' into derp

Merging cuttlefish_common master into cuttlefish master

Bug: 143774116
Test: Treehugger
Change-Id: I7123f11dd33a151d0bd8461c6a6e9a4b6108f7b4