Change-Id: I80ed63846502bf7751b890b6c6c6a7c0679e2b4a (cherry picked from commit 5d381570f83022b411a8740d58486a7f68ab2af6)