Merge changes from topic "multi-se-support"
am: 54502d68ea

Change-Id: I10dad203c4e46b28546f1bb3c721e5d4e7fb0aec