Change-Id: I1bf9983e4ed046c5f1b4b8b18c8f756dac8709bc (cherry picked from commit 0317857fd5d9ddf0c71b53c68308415a0a06c891)