Merge "Expand the allowed subpaths for test directories." am: 04fd23f7e4 am: 1149bcf590 am: 9c0e0deb80
am: 1f6c5fdc52

Change-Id: Idd29408f17aada32114f3ac6c812acee3eaced79