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

Change-Id: I707c653811c0e73a3ac5c5e2e9f082072a2693a2