Change-Id: Ied9339cac2854b5394ae27aebab4ae0597038da9 (cherry picked from commit 023b79590868d23b169402c7a3f8980e2ade2e22)