init cleanup, desc message fix

Change-Id: Icf6e0b3f024ab1285a9ab144433a6925d5e2cbd4
Merge "init cleanup, desc message fix"