Merge "Enlarge cmd buffer size of FrameworkListener" am: 5f890050b7
am: 0f419320d3

Change-Id: I3396300154582b0a14b1ed60e6d6dfd5243e0f0f