This reverts commit 949bd5831d. Change-Id: I042ee40c2b33dff376101e78145f02199a56dfdf Related-Bug: #1505180 Related-Bug: #1504596
949bd5831d