Track fork of Settings

Change-Id: I15d5d2a0e3a4ba9d155cc5394603c152226baf12