Merge "Part1 - Don\'t add padlock if the restriction is not set by admin."...
Merge "Part1 - Don\'t add padlock if the restriction is not set by admin." into nyc-dev am: f498c8dd
am: bea4c54f
* commit 'bea4c54f':
Part1 - Don't add padlock if the restriction is not set by admin.