Merge "Remove unnecessary group from blank_screen." am: 7b9e7c3f4b am: a3dfa8acc3
am: c0404b5a86

Change-Id: I4d6eeb9b1465f3b5b9b902c50f9c050985cb4168