Merge 322330d606f4c4649f5de0f7ebe00755ffcd274e on remote branch

Change-Id: I05bc6c259be95ff4705a31074575880dfc52560a