Settings: Three conflicts resloved

Change-Id: I427d87487a27b119d544c23c0b19abcf0e8e029b