Fix build error with configstore
am: c221d640bc

Change-Id: I43e51d1177f78014675761a4dff1ee1eaa6d77cf