(cherry-picked from c57b29cc104a7f4f1250cf67ce739795f6c2ecaf) Change-Id: If22b1f2151cec52fa17cad7eecb981c3a591dc2e