Pulling latest changes from autotest:next to swapnakrishnan2k:next