Merge remote-tracking branch 'upstream/chrome/m50' into n-release.

bug: 27425935
Change-Id: I02cd1078f89c0b8ed1618783919ccb493daefaae