DESCRIPTION

Adding KV store fixes in multiple places

Change-Id: I7f76d5f8ab837862d52dc505db4103c2b9f171c7


COMMENTS

author: Nico George
date: 2016-10-06 19:04:13.096000000

Uploaded patch set 3.

-------------------------------------
author: Tate Garrett
date: 2016-10-18 15:23:31.281000000

Change has been successfully cherry-picked as d5f6a787799c867ea770a5f129bd0c0289468606 by Nico George

-------------------------------------
