Change-Id: I36623304d83b344ea078044001577b8005a63c02 (cherry picked from commit 80c55109b6351049498df294234dc0a75e75ec44)