Merge with CM

Change-Id: Iab365720e9f981db11b0bb31ff20b0f23418f91a