Let's try TRLS on Settings

Change-Id: Ic79f87a0b52be750a710260755fee1c4b0581dbc
Let's try TRLS on Settings patch update

Change-Id: Ic79f87a0b52be750a710260755fee1c4b0581dbc