Merge "Test for bug 38342499" into klp-dev am: a30a033188 am: c952191151 am: 4e6cedc51c am: 6e787106a2
am: 311cb1ee7d

Change-Id: I2cdd43c6017df83a662a4eda7622dcde03db363e