Fix ubuntu settings

Change-Id: I605e472a52e0bef6418c5f4a799605ccdb86a2cb
Closes-Bug: #1271167