Merge "Do not set PROPERTY_IS_RTT in testapps" am: e42440cca9 am: 001a02caa2
am: 5a7f4317e2

Change-Id: I84faf74d8211d83403b3ac19d0b0c64c4a6d082e