Test for bug 33137046 am: cf4c64adde
am: dc73801a4c

Change-Id: I8adff98f80d10922267c47631a762fbd7929890f