Change-Id: I6359d4a935177aacf5c38af905379e871c7ab2bd (cherry picked from commit e3dc288a7d9226838b8a01cb70fd73c2bb207d11)