Merge f0a78e2698fc4b7a4074bc19d8c8b6bcee48173f on remote branch

Change-Id: Ife534f29cd9237c5679c9b59e0d5427725286772