Merge "Remove bubble from AOSP."
am: c61a76fc39

Change-Id: Id1a9cde1babbf88dd65e9f90e5bd9310d4e8e969