This reverts commit ba49920e. Due to unit test breakage. Bug: 14419121 Change-Id: I6f4fc30b86227e59c883d202551b162dc91b4166