New plan: We need this for the Device Preview images provided on the final L-Preview page. This reverts commit 4974e7f2. Change-Id: I1b5fd6d58c53c6ac14f86c688eaea540d683134a