[automerger skipped] Merge "use putLong for long config" am: 233b4f140b am: 5018857876
am: dbfb25ab7a -s ours
am skip reason: change_id Ibb3e9e2fefcc82eab1deecd65ee81aab0fec8c5e with SHA1 5f7ca3a2b9 is in history

Change-Id: Id0538e2a56b621f7661276f835ca969a139b12c0