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

Change-Id: Ib1088ec8aa9e3afdb05c46681ec8cb7bab74f790