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

Change-Id: I1a51c429ff9db3ff33ae06267bdcf3fd54c16abf