Patch 2 for master.

Change-Id: I8b7c9fd326c4f247a1f2129b1d64388a223d79e0
3 files changed