Change-Id: Ied37ff11e507fc86847753ba79486652c8fadfe9 (cherry picked from commit c962371430b8957500397fe71e944c953f46ed7d)