Change-Id: Ic3563dca7a1dc24e6bf3fab326a9521b2f62603c (cherry picked from commit f0c39754) (cherry picked from commit 4759ba70)