Change-Id: I14737df6eb8829308002849193b2257a8f1a9084 (cherry picked from commit 1a3fef5d0f3a2520fd0b94cd8c55a9433848cfb4)