Merge da1a36eb2e7a8a64054e94f52a12e6a75e514257 on remote branch

Change-Id: Id9e084c506c44ef9f6f0159ee43d25dd2a535780