Merge "Ignore test" into pi-dev
am: de3569ef84

Change-Id: I2e489c20b5d108af5aaa82fb63bed6350c155826