Merge "Update robolectric dependency to v3.6.2." am: cc54c93376
am: 9ff0f548a9

Change-Id: I79a5efd92491c4d4ebcd16cd9d4fe9705760e483