Change-Id: I1916697e36f68d0a0904defae136911aaa69cc7e (cherry picked from commit 393c228e41a48686a565ef6944a589862f6c1677)