Polish Configuration activity

Change-Id: Iae9f224b4fe77876d4e23576bfebd400ba6df353
Test: manual
Bug: 183721209
6 files changed