Merge "Revert "Ignore broken test to unblock TreeHugger"" into pi-dev am: 8482455df7
am: f08dd43f2a

Change-Id: I71761c96deae57d260d35a7dfcfa3bad90cdea72