Merge \\\"Drop less aggressively\\\" into nyc-mr1-dev am: abf66de147 am: 755d3c319e
am: 2461338a20

Change-Id: I62638af9b675f9cf87ecf2f3f22411fc72c71269