Merge changes from topic "include-uiccapptype" am: 614fd1b51b am: 237fc783cb am: 37305cfcb0

Change-Id: I70133db7fa904914b89e53e4e8db86ce4e5cecd2