Change-Id: Ic45baaa974af044a1bc166faf6e27ca5ee4e155b (cherry picked from commit 4a8304486789965c85a498d72250ea84088730a8)