Merge "Merge "Calculate pattern bounds correctly" into qt-dev am: a9610c2452 am: 3f02a31d7c" into qt-r1-dev-plus-aosp
am: d4ac967e28

Change-Id: Ibabc94acad0b330d89e96dcb6ab3c55234ca9a2b