Remove

(cherry picked from commit 36214feb86a0963b23f34c8c63584252bd757e19)

Change-Id: I96d5109c01e39255b9970f7a515ddd3575a50e56
8 files changed