Change-Id: I1d30fe0ca4c1956201e465a32c9ca1aa5919f931 (cherry picked from commit 076db709a912ce23c922e4e10f8e9e94712201ac)