Merge "DO NOT MERGE - Minor fix on internal method name. am: 15b44fe1e3 am: 563b30d6fe" into qt-r1-dev-plus-aosp