Merge "DO NOT MERGE - Minor fix on internal method name." into qt-dev
am: f953da0c20

Change-Id: I70e788bbaaa11dd8aa240af224baa32e8486cd76