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

Change-Id: I3077aab0a0711bf20d3e3074beb3df2f68cb4e52