Patch for MR1.

Change-Id: I3f4bba2854257008eed95b8eacce598abdca3180
6 files changed