Update EAP only when it has valid entry Bug: 8604987 Change-Id: Ib6b10bd06c26ee91c4ecd3a231b509d728725dfc