Merge changes Id19f1bcf,Iff20fb3c,I435f9154,I604f8add,I8bfb9c38, ...
am: 80b9a356e2

Change-Id: I49b0f912affc1a233050ef62044f7166f9da1e29