Merge "Fix backward compatibility when there's no secureElementName" am: 24ae670b4e
am: f18917783c

Change-Id: I1f182bf2655e2ece7a28a9cdef4aa98339ab41b6