Updates for cm-13.0

Change-Id: I6a0efff3bf6ea2e332cacd7cbb2f2b132b2c73dd
7 files changed