Fixing ownerships, permissions in various places

Change-Id: I5e912b4fb1d48b7dbd2e82c362989fb515da0575
Merge "Fixing ownerships, permissions in various places" into production