Merge "Fix AVR compatibility."
am: 9e4df4985a

Change-Id: I6d67424f99eb0a24e0b5dbc70c8ca62ba8ab6457