Merge \"Drop less aggressively\" into nyc-mr1-dev
am: abf66de147

Change-Id: I1f61a994dfae404342b6dfaa85ccb6d4d8fc5c86