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

Change-Id: I958ca8682ee30525b660cec3a4c44b90bb97a50b