Revert some preopts for fugu. am: 0c2f18350e
am: aeaca170db  -s ours

Change-Id: I4fb0ad25458fc0664b4969d9edc5cd4c1d13526d