This reverts commit facd40d0e1. Reason for revert: Broke AOSP Change-Id: Id333417d4970ced800ab801bddfed880cafa056d Signed-off-by: Suren Baghdasaryan <surenb@google.com>
facd40d0e1