Merge "Fix backward compatibility when there's no secureElementName" am: 24ae670b4e am: f18917783c am: 53f9a60d8f am: 80d1a65288
am: b0c17a68c8

Change-Id: I89d010605e113046d22dfba1df9dfce397f533ef