Conflicts:
	ure/Package_install.mk

Change-Id: Ica4cfd3befa67aa1d03140ad2a766dfbb208ec0a
(cherry picked from commit d6785e16)