This commit also fixes some issues with console outputs not matching each other. Change-Id: If24d7763fad7dc0f560032c9cc9dc382d533709f
This commit also fixes some issues with console outputs not matching each other. Change-Id: If24d7763fad7dc0f560032c9cc9dc382d533709f