Merge "Populate initial base info with unknown state values" into rvc-dev am:...
Merge "Populate initial base info with unknown state values" into rvc-dev am: c02b6d44 am: 4bb59689 am: 85abf364 am: bbce53de
Change-Id: I04107aa7b657b3b8a57dbf0ce91f00e50fd00140