Process Pau's feedback

Change-Id: Ia5f04c721e09084efdc77018b11994c5c6314154