Merge fbd02515357a5d78ad0a8c1466e6481370cbf3a4 on remote branch

Change-Id: I6980fce0e8947a783702ed8ecfd84134b10ad813