Merge 7ee5ff62f237f2450eba02c6628746898af7b72f on remote branch

Change-Id: I60f38ce8c6b091b588d2224a4eb13f45d4bbd5b9