Merge 5de78fd1e3d6ce8ec224a1ecd08d45e43cc15c3f on remote branch

Change-Id: I92f26b5331fe22d940623b2548bb03b4d6d7ac8e