Merge "Allow forward merge on powerwash." into rvc-dev am: cc8d4e8e69

Change-Id: Icdf6d373616c964839366dff7f199985239357df