Merge changes I989422c4,Ibdefc49c,I463c8ed4,I813e9d69,Ie6539ce2
am: 813fa56b9a

Change-Id: Ib3f7b9c7c1b546dc543584851f4a4954f15aecf0