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

Change-Id: Ic029e75a190b91394e4fa32f59ad5a48f907d5d4