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

Change-Id: I58fe084d6c8270da5de178c1eac23419b1e59b8b