Merge 34497757b0a2017190c44b270920ef793a2b0aad on remote branch

Change-Id: I9fd1b6dad0e73ddf1a8efeff9073fee33ea99b77