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

Change-Id: I5864d6e77e3d33a3c60902605d79dff765c6b8c4