Merge e65987c7e0373016605b820ebac82f41d80bfc4a on remote branch

Change-Id: Ia45820590856a5870e3ae025f5102ee1dd8f82d4