Revert accidential merge 492a058d58e991445996cb8cc8dcb24494ac20c5

Test: Clean revert
Change-Id: I61d339bb85936e1d50742be1e4c6dab781f3a4e7
3 files changed