Merge "use putLong for long config" am: 233b4f140b
am: 5018857876

Change-Id: I416dcdb2b77a093274a70a97470540f311f3f731