Reduce unneeded changes to Level1 compared to upstream.

Change-Id: I20d762744ba8c59c433b389021fe1014c412811b