Plain Diff
the commits were meant for 5.5. it's only autotest additions, so it's ok. Change-Id: Ic93164cf37ed6e35b2e412fe40530816efe2908d