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

Change-Id: If4929856ddbb972d22764d99d1464386db377bbb