Revert "Merge commit '9b9073a88b62457cb2acc11d2bcbe04f14d965f6' into am-254b7307-4e73-4da2-a305-c1cf8b4ff53d"

This reverts commit 89fb835ca2abe8009187c49774e1143903f889a1.

Reason for revert: Breaks build

Change-Id: If98eecac7d9df8afeff5280c93ac4b0221f81db0
(cherry picked from commit bc2519820074fded37dd3bce6ca81b6b85f789a5)
3 files changed