DO NOT MERGE: Test for bug 69478425
am: a2b706da29  -s ours

Change-Id: I7a5a0a0282f2d023087ff554d1fa60236b168bef