Add check type of legacy_prop_name am: 37116b5567 am: 48d4417668 am: fd544842ca am: c339b4f235 am: eca005c42c

Change-Id: I95e796b2d197fde70e6b21aeecdcdda6b1c7b1d9