Change-Id: Iddf0133919d38fc896f97c6796f8228a6decf174 (cherry picked from commit 51348d2007b801c7bd7350f72e2300f1a5a41dd1)