Minor java style nitpicks - Type specification for Capture - Useless else branch Change-Id: If8d597e0527365d11daf7e930c7b2a60251e665e