Change-Id: Ie19b61bc344eb2d194b667d71ab25e1464614835 (cherry picked from commit 2f5f03371d8ffae6ebbc89ce70af92a0c735b6f0)