Fix build error with configstore am: c221d640bc
am: b3bbd3411e

Change-Id: I0c42b724d6b006ea1204b6fe6d32642221f2dbf7