Fixing patch 139198

Iea375ed5074f72fe13e0bffbacee78f2844fe7c7 didn't fix the issue

Change-Id: Idf28acdae0da005072720a796d73023c35317a00