Merge "BugFix: Config TTL" into pi-dev
am: b6d4401da1

Change-Id: I2871fdef3e659e9edf6a97052cb34b5831aebc34