Merge "Update gts configuration settings for device setup" into pi-dev am: ecc9f5b3af
am: 9220b1044e

Change-Id: I0fa3b2fab952b08b0702ee0bcbc948872d6981a3