This reverts commit 6aee1d2ba5. But leaves in some of the improved documentation. Bug: 18281970 Bug: 18573576 Change-Id: I320f2229456ac039bc8f3cd8bc8b4ea6cf0e80eb
6aee1d2ba5
0ac703fc
1108b845
7377998d
6e854ce5