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