[kernelbranch]

Change-Id: I19a6721ba47ab9633a6e77db59ad86a8ea374547