Merge "more ioctl work" am: 5a7b82062c
am: da8e03da6c

Change-Id: I45ceb7129030ce297cafe05f3b2891c22b12c803