Merge "Fix AVR compatibility." am: 9e4df4985a am: babd85e24d am: 4088527e0c am: 77c749611d
am: 44117eac73

Change-Id: If152556b4a2e4d8a175819be8131b5de69fe9cdd