Merge "Remove unused config" into pi-dev am: aa74c54072
am: 82202f556c

Change-Id: I50e0e5b577ebd11f3656aef9c364f0bdd3f31f32