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

Change-Id: Ia53874838d9887cec89137d630fa76843df722a2