Merge "Merge "Populate initial base info with unknown state values" into...
Merge "Merge "Populate initial base info with unknown state values" into rvc-dev am: c02b6d44 am: 124e9fb0 am: 5943ad71" into rvc-qpr-dev-plus-aosp am: 6601f66b
Change-Id: Ia722b600b18b702db445ffcdbc29464fcd26371d