Merge "Removed obsolete Test" am: 6e3441a8ea
am: 9f5f518c19

Change-Id: I39bccf96f352b1000f2fdd64ffff92e20bbfc340