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

Change-Id: I146bda82e6e618497a06a06365fde61951a25938