Change-Id: I18de018060f80f85e0534a069b2f5c6ecd2c8177 (cherry picked from commit f295ad0c50e56a358bba53ca3861f4558479da8e)