Merge Mer modifications from mako kernel

Change-Id: I77eb00cb3937652e72a8385c3169e24a1a0f9f9d