[automerger skipped] Merge "Fix SEGFAULT in profman" am: 037b50ec79 am: 07031ce210
am: 085a53d791  -s ours

Change-Id: I8804ca949299e79ec575cd7a1c6624345d3f59f9