Merge d10495bb93f8c3ce095d31cc2e2b593e1d3473e0 on remote branch

Change-Id: I535ae267b835a0c4b4b781e86d8fe71598339f67