Merge "Enable sending group MMS" am: 5e920874ca am: acc0a26c11

Change-Id: I0ee5582199e074c8ef3125125ff0cdc8454c4f49