* stable-2.16: AccountCacheImpl: Don't return null on error but Optional.empty() Change-Id: I94e746d9566780b6976d4d665d02946cb0a8c047