Merge "Merge "DO NOT MERGE - Minor fix on internal method name." into qt-dev am: f953da0c20 am: 50615d9261" into qt-r1-dev-plus-aosp