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: 4bb59689 am: 5135d2a7" into rvc-qpr-dev-plus-aosp am: 66b6bbb9
Change-Id: I5c6c680f5e0d8b2a3b1605a5c29166b661c6ec60