Minor tweak to entry point code

Change-Id: I924f79cecaeb21ce311f80c6907064cfd91d3504
Merge "Minor tweak to entry point code"