Java8 Defender Methods

Change-Id: Idad337872af38e76301d4ec3afef4fd783adb643