Change-Id: Iee59e70854b80f592384cfa3593feb304aad3257 (cherry picked from commit a181fd229c03de59a055001aa11ed64844f2396a)