Merge "Fix AVR compatibility." am: 9e4df4985a
am: babd85e24d

Change-Id: I01d0dd2fffc45c4b2e54990595fb922bff849dc1