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

Change-Id: Ib8fc424672947c14e53dbb1586def62312b74083