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

Change-Id: Ib4f4c1dc47febde14a5868ed8b32c9f0fb7e54be