Merge "Fix backward compatibility when there's no secureElementName" am: 24ae670b am: f1891778 am: 53f9a60d am: 80d1a652 Change-Id: I33ebb180831878166645520f95864972b17191c2