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

Change-Id: I7dcad8964cf9ba5aacd8e3b640c3cf87bb031fb4