Merge ae874e840d6e35db78b9a22489de3cf4e6517551 on remote branch

Change-Id: I8d742b48ffc21eb6f1017b0933423ff29c4cac4d