Change-Id: I219418411470bdeae9af84277f5150a623c05e69 (cherry picked from commit 2480da6d987da338fa2688a31a33658da0abeb23)