Merge "[security,password] remove unused code" into 2.0_beta