This reverts commit 436f42bd. Bug: 184201737 Reason for revert: No longer needed with new layout. See b/184201737 Change-Id: I7350fcf7a5415fa70de757748323853c977a55aa