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

Change-Id: Ie1f45b931a20db451ebce65a58d7f011b92d282d