Merge "Fix log for early_mount" am: fff1669341 am: fc60c4694c
am: e17f82f8b1

Change-Id: I284bb6d787dd0939775011ccbdc6b6a5bc2f5927