613bab70b8
Revival and adding some modification to support schema change. See also: I914176d60bfce91fbe449702f7e78bb2f78706ce Change-Id: I2152057ef4843b555a21118cb20bd9eff36c3b7a