Change-Id: Icc3670c9381ce7591ca69ec12da5aa52d3612d34 (cherry picked from commit e81596d06d226f1cfa44b2390ce3095ed4dee621)