Merge "Solve error prone issues GuardBy, Permission etc."