Bug: 20500107 This reverts commit 0084e37095. Change-Id: I57f1f3a22c5adfefd966447050b100a50e7141b2
0084e37095