Change-Id: I6b7a09842d68c0417ae66640463b540500290848 (cherry picked from commit fce7e678802d3087728eafa93992999cc745bd0a)