am df293f14: merge in master-release history after reset to b31f33b5e41bf295705b8f0c1582c6277e8fec64

* commit 'df293f14f5bdb4f572c7f836ebb0802a177836ff':
  Fix encryption on Nakasi