Merge e65987c7e0373016605b820ebac82f41d80bfc4a on remote branch

Change-Id: I99f591a9cf2bb5b5e15b596f44d5754386584e53