Merge 4f2994f0baa79311cf260f6a090ca9f8deacd0d2 on remote branch

Change-Id: If33d0ad2d0ded94288ab2147cd9596bcc356c6f2