Coding style fix in package related source files

Change-Id: I8248093f19eadf9965da66930caf32a270e93319