[automerger skipped] DO NOT MERGE Change RemoteFeature to use component intent am: 3255b210ce -s ours

am skip reason: subject contains skip directive

Change-Id: I81d057070903a769b5f42a8ccc6175c3cc6f7990