Merge "Add the basic config to run through atest" am: dc738093fe am: d006f4154e
am: e62782cfc5

Change-Id: I4a9ead596891f1d104e96506e75ebc9c5e1623f6