Merge remote-tracking branch 'origin/next-simrel'

Change-Id: I47479685a326172f1f5011b79186350e42fc2b0d