Merge "Flush json writer when collecitng extended device info." into oc-mr1-dev
am: bd2521ee27

Change-Id: I12ef6a6de9cafe5fed478d4074e1e399bbdf3b70