Merge 0dc2305507907b61f72f3269d78e1392fca84d58 on remote branch

Change-Id: Ia6bcf0320869fe8eee037710af88f8a38b7bbb7d