[automerger skipped] Prevent NPE when profile is null am: c3ea0d3f79
am: cd9ee08bae  -s ours

Change-Id: Ieb0da01e661a8bf91be34cb14f611f7765740bef