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

Change-Id: I514c9bd97c6aca3020687941e695db4e3f134e92