Merge "Add extra checks around the profile file descriptor." into pi-dev am: 2df6aa4178
am: 7fac461750

Change-Id: I1142460bc563335abf1146b6c6406dc3090f85c4