Some merge failed in R2.0.
Master file and R2.0 was not the same so copy pasted to R2.0.

Change-Id: I0800f9d39955e5830616d2db432a5ea2684f6b69
Merge "Some merge failed in R2.0. Master file and R2.0 was not the same so copy pasted to R2.0." into R2.0