Forward Device remove to MASTER

Change-Id: I5bf0fc76ffd04d5a1165d24e82eedd7993ec95be
2 files changed