Merge 40e0c3c703898c0aa1ccb8d6edeecbdb7d7facf0 on remote branch

Change-Id: I3787b908ae5c60416f9271fb76f270aeadffecb7