Support GIT upstream am: 24950e7978
am: ec6029e3b4

Change-Id: I3804c44d3f314e6cbb256c5b34095717ec7e30c2