am 66684a74: am 96f54480: am ba13ae79: am d168bd54: am 6d91e4ce: Fix offdevice test build.

* commit '66684a74dc0dd49e1deb855426e07987b12a8827':