Merge "Fix SEGFAULT in profman" am: 037b50ec79
am: 07031ce210

Change-Id: I9c26716c128509b8dc8c6273b10fc7aa390f7dfe