Merge 10952656

Merged-In: I38da1343501d27516ec73bedc0bec2f1588c2073
Change-Id: Ica30acad571c2f0a74b2e022c90dc232aacf4fa6