Merge "Update ViPER4Android to version 2.4.0.1" into mm6.0