Change-Id: Ia552577811ed1cafe0a7c4f56bf0c1b55f8c61c0 (cherry picked from commit f42010b17156528afec473be84ab49088a412422)