[automerger skipped] Merge "Add check for CSIM application presence" am:...
[automerger skipped] Merge "Add check for CSIM application presence" am: 48ed18d3 am: f7c93afe -s ours
am skip reason: Change-Id I5f96f0ad1dad084b7a620a1dfc3594a089a6e3fd with SHA-1 b2d694e3 is in history
Change-Id: I4516e9ec3c9818dc738ac71d2658d0049686d83f