Merge "Collect status on uncrypt time cost"
am: bc19e00d35

Change-Id: I867821b7575ee2e45bb86c46222e6cf34971689d