Update RSS to master

Change-Id: I46f3a0dbd7e0d9967e23a4b288204bbfbd916488