Merge "DO NOT MERGE Add test for bug 35763994" into klp-dev am: 17d0426f61 am: 7678bd65ac
am: 417124a001  -s ours

Change-Id: I157dea31718447665b547191169f2780f7e190df