Change-Id: Ia440472729f4f69a3af0bfbe0f665499b2cf36fe (cherry picked from commit 5105a3c555cebcc3cc4abcbb57e6be0e6d6719fb)