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

Change-Id: I32b8ab597bf2fba50942334c69cb3bf3a57a8d72