Merge branch '3.0.101' into kk_mr2

Change-Id: I9ff8141ce4ab6617cf77b3d36c4d487cf19733f3