This reverts commit 16efc5e68d.
Caused issue with device protected settings: http://b/33066012
Change-Id: Ib485bed68ea8ac199d553b666c18d048a5624c98
This reverts commit 16efc5e68d.
Caused issue with device protected settings: http://b/33066012
Change-Id: Ib485bed68ea8ac199d553b666c18d048a5624c98