Challenges after upgrade to 3.5 from 2.7

Change-Id: I8f1b51b8c89d250a48a2f04daf754747dd8f94ec
2 files changed