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

Change-Id: Iab1720aa3db4602795a703aa12729e0c5cb1d635