Merge changes from topic "signed_quant_cherry_pick"
am: 45e64ac5dd

Change-Id: Ied0c486d38dad9c9770e85305764061efebb3211