This reverts commit 14e96187. Reason for revert: satayev@ Bug: 156336269 Change-Id: Ic0d3a650156c06f58fce4c28157191f4497469f0