Merge "Set noparent to avoid it recursively looks up. Android biometric team should approve all change in this subdirectories." into main