Fixed API merge issue in master.

Change-Id: I4bf0104ee703daa4da78d6637c1fa82ace57f073
1 file changed