Merge "Only display System section for current user." into nyc-mr1-dev am: c24a46128a am: 9eb3b31c29
am: b934885f0c
Change-Id: I2905157ca66a71e6119f47ac3fc536e8b29e3fd9
This commit is contained in: