Merge changes from topic "signed_quant_cherry_pick" am: 45e64ac5dd
am: 0d7921292b

Change-Id: I8d9dfd53e5c8fac3d8383b638ee53515ebe42496