Change-Id: Ib1c5ca814c15d68ca4d47509183fafdbe746c63c (cherry picked from commit c5461a251cf2a82b86e48d650fc6e3716a7810e1)