Merge "Work-around for crt objects with sdk: current"
am: 7335e16774

Change-Id: I93941a10b954fec9cd73514f60feede7b51fbf0f