OSDN Git Service

DO NOT MERGE Cherry picking from MR0 cl 147215