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

Change-Id: I74454f6bf7199dc40844bb1c71b94c7b9785414e