Patch 2 for MR1.

Change-Id: I39cc780e0ef49c4e0863a1a83e585e16f0a32425
2 files changed