Updated rules for legacy targets from generic targets Change-Id: I1128703a8303d5359c3a28329a7f3c3f091d9d44