Add check for bug 1270608

There was no check for bug 1270608, this adds it.

Change-Id: I006a3ed270ea3c53ea821ad20f290a3d4c292237
Merge "Add check for bug 1270608"