Merge "Remove test skips associated with b/37240685"
am: 452092b4c9

Change-Id: I91a4ac9f600e4cf6f648f816bce68a002b55c17d