Merge "Remove bubble from AOSP." am: c61a76fc39
am: 8e3dbcc278

Change-Id: I3af481c6a2729b4c530543b9fcf99e488467b040