Change-Id: I1349e740037f81afdbe30edbe741f20e88fd0a90 (cherry picked from commit 5e02b4915b876eab943b30cf728cfc26ba832188)