Merge "Add a readme with instructions on running tests" am: 08217cbd4b
am: 931504bb24

Change-Id: I5e631e039e1fadd499e70fd7ad8d40acc945a9de