Merge "Flip BLAST on master" into rvc-dev am: 4c8d22f924

Change-Id: I7b42b5f4cdc7c78c7868db50dd40d91e6ccd0f85