Updates for cm-12.1

Change-Id: I3eefaadce417ed3802f31bd62ee57a3b18561839
4 files changed