elastic1007 + master eligible, elastic1008 - master eligible

Change-Id: Ifd68218bc0566226ffd53383752673e7de7fa74b