Merge "New strem for honeycomb stable/1701"