Cherry-pick 3 upstream fixes am: 9888dce90e
am: 44d6b9bdc6

Change-Id: I3d3eba10ed65fee152fea7cae879cdfafe895c66