Original flag is still used by device specific makefile guards. Change-Id: I528ee2a2a25680994561e4c3fc377f7b57106a89
privateremote