Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger
am: b1df48d326  -s ours

Change-Id: I915d9c44742a9e4193a5c405e0d4cfae770aaaf7