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

Change-Id: I8ef4ddbeef7b050627021ed92892246a9bbd6488