Merge "Move the tests to postsubmit group" am: a42af36002
am: 8493872c99

Change-Id: I2dcdf495c039801d22c9dec8d7bf00525b77ebd9