Premature submission. Need to wait until stubs support 1.8. This reverts commit 311a97e7. Change-Id: Iba1361b90f75cad139f94044184c5295483fedcd