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

Change-Id: I963ccde31ca834bf4fec47e4dca05dcce1d1c4e2